Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Thu, 18 Mar 2010 07:22:27 +0000 (08:22 +0100)
committerJan D. <jan.h.d@swipnet.se>
Thu, 18 Mar 2010 07:22:27 +0000 (08:22 +0100)
commit360f81a4bdc5641d1ef85ddb07da14051726294e
treee5551d9dcc809cce5d6282711a6e19893e0ec108
parent79ff76b5e5f3a5fe0e0bce63cc1ab478b2c91306
parent9edeae66e9c4c2243071ea65ac81f2ef7701cd0b
Merge from trunk